Parallelize CLI and GUI make. testo and vtesto are harder.

diff --git a/Makefile.in b/Makefile.in
index 9decf2320ea5b4a5d015756383fa3a8cefc31dd0..246e043dc51c4a0533fe2ffb39e553477770e4cb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -393,7 +393,7 @@ rpm: changes.html
        tools/mkrpm $(WEB) $(VERSD) $(RELEASE)
 
 gui: gpsbabel$(EXEEXT)
-       cd gui ; $(QMAKE) app.pro && make
+       cd gui ; $(QMAKE) app.pro && $(MAKE) $(MAKEFLAGS)
        cd gui ; $(LUPDATE) app.pro
        cd gui ; $(LRELEASE) app.pro
 

diff --git a/build_and_test b/build_and_test
index 6e654bedc80c1eec895b5e314f3d01e418293b3e..719d307e5d10579ecc896bbaf05fa291b4208d6e 100755 (executable)
--- a/build_and_test
+++ b/build_and_test
@@ -24,6 +24,10 @@ touch internal_styles.cc
 export GBTEMP=$(pwd)/gbtemp
 mkdir -p $GBTEMP
 ./configure --with-doc=$(pwd)/gpsbabel_docdir
+# As of 2018-10, all the virtualized travis build images are two cores per:
+# https://docs.travis-ci.com/user/reference/overview/
+# We'll be slightly abusive on CPU knowing that I/O is virtualized.
+export MAKEFLAGS=-j3
 make toolinfo
 make clean
 make